ci: Drop patches when building RPM
authorColin Walters <walters@verbum.org>
Tue, 3 Apr 2018 13:59:20 +0000 (09:59 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 3 Apr 2018 14:28:13 +0000 (14:28 +0000)
Things fell over when downstream added a patch we had already merged
upstream.

Closes: #1530
Approved by: jlebon

ci/libpaprci/Makefile.dist-packaging

index 8ecaeffbdac74469f672c27b67e5140397fbbb5d..de77be6cbba139fe7595ae60150bfac3927177a2 100644 (file)
@@ -30,7 +30,7 @@ srpm: dist-snapshot
     origdir=$$(pwd); \
          cd $(DISTGIT_NAME) && \
                git stash && git pull -r && \
-         sed -i -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \
+         sed -i -e '/^Patch/d' -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \
     rm -f *.src.rpm && \
          $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \
        fi